Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes Camera.project_position to not return get_global_transform().origin if projection mode is orthogonal #34233

Closed
wants to merge 2 commits into from

Conversation

fsy98
Copy link
Contributor

@fsy98 fsy98 commented Dec 9, 2019

Fix #33837

@Chaosus Chaosus changed the title 33837 Fixes Camera.project_position to not return get_global_transform().origin if projection mode is orthogonal Dec 10, 2019
@akien-mga akien-mga added this to the 3.2 milestone Dec 11, 2019
@akien-mga
Copy link
Member

Could you squash commits together, and give the resulting commit a more explicit commit message? See https://github.com/godotengine/godot/blob/master/CONTRIBUTING.md#format-your-commit-logs-with-readability-in-mind and PR workflow.

@fsy98
Copy link
Contributor Author

fsy98 commented Dec 11, 2019

is wired that I squash commits together,but it make mistake

@akien-mga
Copy link
Member

You still have 2 commits, with Merge pull request #1 from godotengine/master which should not be included in this PR.

And the commit message for the second commit is:

Update camera.cpp

Update camera.cpp

which is not explicit at all.

@fsy98
Copy link
Contributor Author

fsy98 commented Dec 11, 2019

Sorry I am totally new to the GitHub, I force change the commit message, but I am confused why after I did the squash commits, it still shows Merge pull request #1 from godotengine/master …

@fsy98
Copy link
Contributor Author

fsy98 commented Dec 11, 2019

I don't know why I am in that commit, is not done by me, and it seams that is the master of my commit, did any one have a good idea to solve that?

@akien-mga
Copy link
Member

Sorry for the delay.

The first commit is there because one of your team member used a Pull Request to update your fork (Team-Bad#1) instead of doing a manual pull. GitHub sadly lacks an option in its interface to update a branch without custom modifications to the latest upstream master branch.

I fixed it myself by rebasing on the upstream master branch, and fixed the style issues that were remaining (missing space before !=, and trailing tabs after }). I could not force-update the PR as modifications from maintainers have been disabled, so I pushed the fixed commit directly: d80e979.

Thanks for the contribution!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
4 participants